From 54000d0ede49f23529889613f1a04e45fb1f0c13 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Jan 2009 15:02:33 +0000 Subject: [PATCH] =?utf8?q?Bug=20566862=20=E2=80=93=20pixbuf=5Fnew=5Ffrom?= =?utf8?q?=5Ffile=20does=20not=20autodetect=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2009-01-07 Matthias Clasen Bug 566862 – pixbuf_new_from_file does not autodetect format * gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing without looking at the filename, to avoid breaking expected functionality. svn path=/trunk/; revision=22073 --- gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/gdk-pixbuf-io.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 1ebcd21841..d50d57e481 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2009-01-07 Matthias Clasen + + Bug 566862 – pixbuf_new_from_file does not autodetect format + + * gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing + without looking at the filename, to avoid breaking expected + functionality. + 2009-01-01 Matthias Clasen * === Released 2.15.0 === diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index c24d456066..641e747513 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -794,7 +794,7 @@ _gdk_pixbuf_get_module (guchar *buffer, guint size, gchar *type; gint j; - mime_type = g_content_type_guess (filename, buffer, size, NULL); + mime_type = g_content_type_guess (NULL, buffer, size, NULL); for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) { GdkPixbufModule *module = (GdkPixbufModule *)modules->data; -- 2.30.2